Add validation composition & tests