Fix rspec tests
Comment cucumber tests