cleanup from merge of updates from libgearman's libtest.