Cleaned up tests.
Removed imports. Addresses #21.