Add the conditional If(Then()) validation and new tests