Fix those two broken tests.