More fixing unit tests

Change-Id: I27a2010e6f786831aa3044e3d95778c37fc9ac74