simplified tests, removes requirejs, some usability improvements