Main consistent with gui
Merge branch 'tests' of https://github.com/adamnie/TC-SEFR into tests