Fixed acceptance tests