Added tests for Drawable using with-derefs.
Comment fix.