Fix unit tests

Change-Id: I05675e2746e53796470ec3b55307a9f130b6559c