Energy test review - part 1

Energy test review - part 1