Merge pull request #43 from apache/validation-test-tweaks