JAL-1264 further refactoring of panel + unit tests

No match.