of-test clean-up for EA4

Change-Id: I2212e2c51674baa3f662d01396b4c92f2675dc61
6 files changed