first stab at fixing tests
fix tests that are actually failing
weird bug in domain exceptions
remove test test
Merge branch 'master' into fixtests

Conflicts:
	lib/userStorage.js
Merge branch 'fixtests'