Refactor testdata creation

This currently uses data from a special branch in the testdata repo, which is hardcoded. Needs change before merge!