fix @step collisions in acceptance tests