Minor refactor for performance in test control panel