fix tests and validation on update