Fix tests, maybe