[UPDATE] Test Cases