Rename Customer methods, add tests, refactor