Fixing tests
Properly load organization totals with tests.
Merge branch 'master' into production