Fix some tests that I broke.