use new test data for metadata
use new test data for metadata

and refactor tests slightly

agoldst/dfrtopics,joncgoodwin/dfrtopics,joncgoodwin/dfrtopics,agoldst/dfrtopics,joncgoodwin/dfrtopics,agoldst/dfrtopics,agoldst/dfrtopics,agoldst/dfrtopics