Fixes incorrect tests

USERGRID-1783