Add and modify some rspec and cucumber tests