More ImageDraw tests. Some may need redoing after issues #367 and #463 are sorted.