Added support for more types, test now tries creating a form for Draw in image.