Merge "Fix libgui tests."