Acceptance test refactoring.