Refactor Acceptance tests.