Adding test coverage for the actual use case.

Also removed an uneeded call for drawing, having a *2 impact.
Last minute rendering.