Merge "Adds missing OperationValidationTest"