add cucumber tests, clean up views