test fixes / PEP work