changed all tests to use DrawingBuilder to create the drawing