type exprs up
fix tests