Merge "libgui: Fix the tests so they build."