Merge in all of libtest updates.