Testdata from desktop. Merge in any changes on mac to here.