updated CustomerService and its test according to issues #18 and #19