Patching up some unit tests and finished initial pass at BraintreeCustomerService