Run CS checks _AFTER_ real unit tests
Merge branch 'hotfix/run-cs-fixes-after-real-tests'