Working on Switch test passing