[425799] Eliminate duplicate test code
[425799] Fix icons for ConstraintLocators