Beginning refactoring complex validator tests