Test cases updated for switch to ids