Merge "libgui: Fix some bitrot/warnings in tests"