Updated customer service and added tests