fix pyflakes issues with new P4 and test code