Validator Refactored, Test Cases comment

Validator Refactored, Test Cases comment