More acceptance tests refactorings