Rolled back using Cucumber. More rspec tests prepared, though they might get changed.