Prepared Cucumber Test for merge into master. Squashed commits.