Fix unit tests

Change-Id: I48bfa4e4dd80f36d2fe0a1e9d2a2706533cc722e
4 files changed