add Expr to tests