Changed and added onto Cucumber tests.