Merge pull request #21 from ZooTypers/master

Pull
Changing up old tests and adding new tests.
Merge pull request #75 from dyxliang/master

Pull