Test diagram is now more complicated.  Added a couple tests