Revert a change in UT

Change-Id: Ifdff811c881adcfb0895128ee97de8d2a65e82b4