fix cucumber tests
fix rspec tests