Modified Customer.java and CustomerServiceTest.java