Add image drawing, update tests