Never return an empty package.

Fixed a bunch of tests.