grouped expr in expr builder, added most of the expr, grouped some tests