Test cases refactored