Fix tests (again)