ARGO-188: minor updates for readability and testability
ARGO-188: tests for status highlighting stuff
ARGO-188: consolidated two loops into one for a couple test cases