Step 10: Refactor test follow new requirement