Fix tests a bit more.