Packaging and test fixes.