Added back browserify to the build task. Removed it by accident
Refactoring the controller and its tests a bit