STY/REF: PEP8 cleanups in tests, remove commented code