Acceptance tests refactoring