made the testcases a bit more robust to timeouts and delays