More refactoring for CustomerViewModelTest