Fix unit test

Change-Id: I9c8ccf86a5716528606c22a1f18e65447377bf72