POD, test tweaks