cleaned up test_validator