tests fixed

Change-Id: I8b21178986cd154c7acb949edeceffc92adb093c