fix unit tests.
move testcatalogs to cdmUnitTest