moving test to a different package + refactoring of CostCalculator