Acceptance tests modified