Fix some not quite 100% working tests.