Attempt to make test more robust