Test: Customer refactor