Fix tests (recent optimization)