Futzed with the TestController.
Removed TestDrawer(), I think we'll live.