Update testing code, fix #33, again.
Merge pull request #38 from zpbx/fix

Update testing code, fix #33, again.