added more tests, working on cateloge