Fix for tests

Change-Id: Iaa0ce09ca21cb28537f384d699bd9b74d384114d