Cucumber tests added and some changes to other code to help students