PEP8 work, revert some overly strict PEP8

1 job for energy_tests in 4 minutes and 58 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #456891
test_min

00:04:58

67.0%