Fixing broken unit tests
Fixing UserServiceTest
Making timed unit test a little more forgiving for slower computers
Fixing resource handling
Handling resources better with unit tests
Merge branch 'master' into dev/TAX-37