refactoring: rspec and cucumber tests and more