Moved Validation to validator class
test