Added test for Pricing Service. Fixed bugs in pricing service. Fixed some warnings. Refactoring