Fix tests.
Fix packaging targets.