Update defs.
fix tests