Image path rework & Dual-shot test