Set new dependencies.
Import from the right package.
Get the tests back to work and more refactoring.