Fix acceptance tests, better error messages