Merged in last of testdat changes from testdat2 via meld