Revised cucumber tests
Refactoring rspec
Refactoring and completing tests

Rename feature files, in order to how they run