Tidy up cucumber tests