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

Pull