Fix unit tests

Change-Id: I0aa7e7541d3eb1d2e331a002a2b7a9e8a1bf0bde