Made test more stable

Change-Id: Ic151ed1351906b6fd4d5aacf3dcc0aba70ce86c6