Add temp fix for tests
Tidy up
Do not use `baseUrl`
Merge remote-tracking branch 'origin/master' into oja-fix-tests-temp

Conflicts:
	test/app/main.js