some pep fixes and fix unnecessary request data in tests