Remove test conditions that are no longer required
PEP8 cleanups