refactoring acceptance tests