Refactored tests to clean up

USERGRID-1861