Fix tests a bit.