Further consolidated the tests
Merge branch 'two-dot-o-rest-refactor' of github.com:apache/incubator-usergrid into two-dot-o-rest-refactor