Rename test file.
Fix dependency import.
Remove unused dependency.
Add some more tests.
Clean up a little.