small simplifications

1 job for energy_tests in 4 minutes and 7 seconds