testing issues

Change-Id: I9e9f6f80eeb2cecc384d2783d139ea952febe6c7