Try to make test more robust