acceptance tests
acceptance tests fixed