Fixing test failures/tests-metadata