Test Cases refactored.