fixed jasmine tests
Merge remote-tracking branch 'phil/master' into syntax_fixes