Update tests and make sure validation passes correctly on child->child records