More mods on PG test