Energy test review - part 2

Energy test review - part 2