fix merge issue for test
Merge branch 'master' of github.com:cloudspokes/tc-api