Bring some tests over from a branch.