DiagrammedExpr Refactor

Moved DiagrammedExpr and DiagrammedExprMacro from scalactic to scalatest package.