Fix all cucumber and rspec tests. Final edits