updated tests
Merge branch 'master' of github.com:apigee/usergrid-node-module
update tests, fixed token bug