Fixes for metadata tests in light of new compliance architecture