Packaging fixes
Test updates