Make test a bit more reliable