Fix tests
Merge pull request #33 from chen3feng/develop

Fix tests