some more tweaks for random tests