Updated tests to reflect usage in bug

USERGRID-1960
Merge pull request #194 from apigee/USERGRID-1960

Updated tests to reflect usage in bug