Revert to Cucumber and added tests.
Merge branch 'delebota' of https://github.com/alephtwo/cs485 into delebota