Add Diagrams, make tests not use .arrow()