Fixed documentation.
Fixed imports to avoid broken tests.