Added Argument Validator and tests