Avoid calling api during test.
Merge pull request #136 from iceglow/cleanup

Avoid calling api during test.