Fixing up some final tests.
Merge pull request #8 from ZooTypers/master

Getting most recent version.
Merge pull request #213 from dyxliang/master

Pushing updates.