Merge from libtest.