Hopefully make all tests stable enough to be run with --random,