Yet another attempt to fix a test case that only fails sporadically. In case it does still fail, adding a little more information in the failure message