* Tweak energy validator * Update code and tests * Tweak implementation * Update tests * Update after rebase