Test cases were updated for traceability