refactor all acceptance tests