Fixed all acceptance tests