Cleaned up tests.

Fixes #4