Added draw call highlighting and tests.

Fixes #483