make existing tests more robust, hopefully reduce random failures