acceptance tests fixing
tests fixed