fix "rest1" test

Hi Olaf,

There are few apparently useless headers in energy.hpp that are commented out, if any error occurs in Jenkins' test, it should be relevant to one of these headers.