Fixed test cases that broke due to additional internal validation.