Adding some safegaurads against random test failures due to noise