Test fixes

Down to only 1 legit failure - stabilized the flapping tests as well.