Fix tests (again?)