Revised SalaryCalculator.java; created SalaryCalculatorTest.java