Major refactor of cucumber tests.