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

Pull