Fix tests that my machine didn't like...