Cucumber and RSpec tests

Please review and let me know what needs to be tweaked.