Fixes incorrect tests

USERGRID-1783
Merge pull request #168 from apigee/USERGRID-1783

Fixes incorrect tests