Updated the Acceptance tests