 )
 
 
-(defmacro call-being-tested [call-form expected-result augmentations]
+(defmacro call-being-tested [call-form expected-result overrides]
   "Creates a map that contains a function-ized version of the form being 
    tested, an expected result, and the file position to refer to in case of 
    failure. See 'expect'."

;; but those fail for reasons I don't understand. Bah.


(defn- separate [augmentations-and-expectations]
  (let [expectation? #(and (seq? %)
			   (or (= "fake" (name (first %)))
			       (= "not-called" (name (first %)))))
	grouped (group-by expectation? augmentations-and-expectations)
	default-values {false '() true '()}
	separated (merge default-values grouped)]
    [(separated false) (separated true)])

     :expected-result ~expected-result
     :expected-result-text-for-failures '~expected-result
     :file-position (user-file-position)}
    (hash-map ~@overrides)))

;; I want to use resolve() to compare calls to fake, rather than the string
;; value of the symbol, but for some reason when the tests run, *ns* is User,
