fixed acceptance tests too