Refactored Test Cases