     (keys @builds))
 
   (builds [this job-name]
-    (when-some [builds (get @builds job-name)]
-      (vals builds)))
+    (->> job-name
+         (get @builds)
+         vals))
 
   (builds [this job-name from]
     (->> job-name
-         (get @(:builds this))
+         (get @builds)
          (builds-starting-from from)
          vals))
 
   (all-builds [this]
-    (->> @(:builds this)
+    (->> @builds
          vals
          (mapcat vals)))
 

  (chronological-tests [this job-name from])
  (tests         [this job-name build-id])
  (set-tests!    [this job-name build-id xml]))

(defn- builds-starting-from [from builds]
  (let [from-timestamp (or from

  ;; TODO find a solution for 'stale' tests with no matching builds
  (chronological-tests [this job-name from]
    (->> job-name
         (get @builds)
         (builds-starting-from from)
         keys
         (map #(load-tests job-name %))
