Clean up no-longer-useful test utilities
Make more code ignorant of clojure.test