[GLIB] Garden a few tests and unify some expectations