fix rspec and cucumber tests