acceptance tests refactored