fix all unit tests

Change-Id: Icc3551dd2561f6afc81ed904af7063bb95579f33