Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev