Updates to several unit tests
* Replaced old test-data.xml with test-concepts.xml
* Use metadata bundles where needed