some fix for test cteation & test passing