rpg: test tweaks