Move TerminologyBasedSolrizer into OM
Clean up fixtures