Added optional RuleSet arguments to the validation test extensions.
Fix indentation, naming and remove unnecessary comments from previous commit