chnaged tests structure