Test packaging fixes