Refactor to handle updated generator 

Added e2e tests and am using coffeescript.