Modify unit tests Change-Id: I75a71b48475b75ca6603756c33fad3742fea2900
Change-Id: I4fe191d9fb3012e82ee93ad1ffec3cfa8dfc7651