Merge "Refactor StatsdValidationTest somewhat"