Started refactoring acceptance tests