Moved over RSPEC and Cucumber tests