HCOLL-251 Make the tests more stable.