Updated Switch for Test cases