Fix unit tests

Change-Id: Ic71d359f97a49f43de1123ab4d06878a822b571b