Merge "Fix OuputPackage Test"