Fix test breakage in S22-package-format