Remove unused dep
Clean up tests
Make tests pass again