Made test more reliable

Change-Id: Ibd93d834abaa1ec2ba322ab4ca9f53944cfe9519