Ss pricingserver/testrefactor

Closed, because more commenting and general organization work are required prior to implementation of this feature.