Add validation and test modification.