Moved graphics.Draw methods to their appropriate classes; ImageTest