A few refactorings and some more unit tests

Renamed SearchCriteriaMapper to CatalogServiceMapper. Added some initial
unit tests for it. On the client side, created a CriteriaBuilder object.
Now using the new CriteriaBuilder object on the client side