Make red test green for strategy & conjured Icons (except 8)
merge