Update from libtest tree.