Cleaned up tests.

Fixes #4 

Since this one is kind of big, assigned to current Lead Maintainer.