revert test changes

Change-Id: Ib84e6d9dc0a922847946af4e08a9c8a6b773734d