Update docs.
Fix imports in the tests