Unit test for Energy Bar + Updated Unit Test HB

US 1.8.1 & US 1.8.2