p2: fix gc-test by using -DP2 (different Potion* layout)

several minor improvements