Move testdata out of main repo
Clean up tests a little