fixed test runner, added new White version, added DrawHighlight