Removed unused imports
Renames tests with duplicate test names
Fixes broken test
Merge pull request #52 from tyewang/cleanup

Cleans up unused imports and fixes some broken tests