Fix cucumber tests, add controller test.