First pass in merging libtest