GSG tests: fix some compile errors cause by package renames.