Tests are now forced to pull from mongo before test is applied, restructuring
Merge branch 'dev' into james_mocha_tests, prepare for merge to dev