Updated unit tests to use metadata bundles instead of test-metadata.xml