Removed requirejs, rewrote unit tests