Merge "Add validation tests for consistency of model inputs and outputs." into pi-dev