Move all kinds of test code into testing directory, to clean things up a little bit.
Sort out requires...
Remove reporting variable. Use DebugDiagram instead.
Change lots of things... Diagram_spec.rb is running, by the way.