Merge in merge of libtest