Added Power Test block, plus some minor refactoring.