Merge in version/etc libtest