Fix tests, other things.