Fix leftover test failures because I'm negligent