fixed debug output in whizgraphics
updated test output patterns, fixed andy's broken merge