refactor control panel tests
Merge branch 'master' into ericof-fix-image-scales
debug versions on CI