Fix tests, again