Merge in libtest updates.