[case 8789] Ensuring baseline + test