Added Validator and test classes