reformat test for less oof
pack scoped packages correctly (fixes #6175)