PEP cleanup and addition of test case overlooked.