Start in on the merge of v2 and v3 test namespaces

- Merged fact-names
- Merged resources
- Created a new defixture macro for using a fixture (via
  clojure.test) that could also be invoked directly as a fn
- Fixed the failing resources tests