commited tests on catalog --- incomplete