Cleaned up unused imports
Reorganized tests

Reintroduced the tests that were recently removed. They now
have their own test classes.