Make test more reliable

Change-Id: I16a0000ae506b5aef4f4d44cf0ee7235da14a21a