                :samples ["sample1" "sample2"]})
       nil
       false)
-    (let [exp (cdb/run-query db {:select [:name] :from [:experiments]})
-          samples (cdb/run-query db {:select [:name] :from [:exp_samples] :order-by [:i]})
-          probes (cdb/run-query db {:select [:*] :from [:probes]})
+    (let [exp (cdb/run-query db {:select [:name] :from [:dataset]})
+          samples (cdb/run-query db {:select [:name] :from [:sample] :order-by [:i]})
+          probes (cdb/run-query db {:select [:*] :from [:field]})
           data (comment (h2/genomic-read-req {'table "id1"
                           'columns ["probe1" "probe2"]
                           'samples ["sample1" "sample2"]}))]

                 {:NAME "sample3"}
                 {:NAME "sample4"}]))
      (ct/is (= probes
                [{:NAME "probe1" :ID 1 :EID 1}
                 {:NAME "probe2" :ID 2 :EID 1}
                 {:NAME "probe3" :ID 3 :EID 1}
                 {:NAME "probe4" :ID 4 :EID 1}
                 {:NAME "probe5" :ID 5 :EID 1} ])))))

(defn detect-cgdata-genomic [db]
  (ct/testing "detect cgdata genomic"

(defn matrix3 [db]
  (ct/testing "cgdata genomic matrix"
    (loader db detector docroot "test/cavm/test_inputs/cgdata_matrix")
    (let [exp (cdb/run-query db {:select [:name] :from [:dataset]})
          samples (cdb/run-query db {:select [:name] :from [:sample] :order-by [:i]})
          probes (cdb/run-query db {:select [:*] :from [:field]})]
      (ct/is (= exp [{:NAME "cgdata_matrix"}]))
      (ct/is (= samples
                [{:NAME "sample1"}
