Fix tests.
Fix package.