Validation test fixes