Update from libtest