Final changes to Cucumber tests for sprint 1.
Merging tagged files.