Fixed unit tests
Merge pull request #655 from shenrie/master

Fixed unit tests