fixed test compilation issue
Fixing test failures/tests-metadata