Added more tests to DiagrammedAssertionsSpec, and making adjustments to DiagrammedExpr and DiagrammedExprMacro to pass tests.