Acceptance test refactoring