Revert "Finish fix-tests"

This reverts commit 4634ab2e1660e6226c6c61c105c4dcbbc34ae45f, reversing
changes made to 292708cb408ef1f1f4fcd306a99d14981f4d8583.
update env
Merged 'dev'.

Conflicts:
	config/karma-base.conf.js
	test/unit/comps/user/userModel-srvc.spec.js
	test/unit/shared/i18n/language.fix.spec.js