Test fix in automated mode + small enhancement