More fixes for requirejs with jasmine tests