fix unit tests

Change-Id: Id61c9b8c3e1e86b6655e0d69f319c6e9fde3c259