Acceptance tests passing