added tests to facet_wrap_labeller and fixed code up in g_legend