Updating unit tests.
Merge pull request #109 from dyxliang/master

Pull
Updating unit tests.
Merge pull request #110 from dyxliang/master

Pull
Merge pull request #1 from ZooTypers/master

cd