Fixes acceptance tests