Attempting to make test reliable

Here is another attempt to make the tests reliable.