Merge pull request #368 from angathorion/tests-fix
Fix GUI tests.

(main@71183ae55c56b029e0364f0ec4c1d6077562abf6)