Fix some of the tests I broke earlier.