Merge in libtest.