Cleaning up the acceptance tests