rpearce/pbrown: Reverting changes to test framework that are no longer required.