Refactor Validator class and Begin Unit testing