Adding more testing.

USERGRID-1434