changes for post M5 test framework
3 files changed