test push
merge test/priceCalculatorTest.java