Fixed up cucumber tests with one still failing. Yay!