Changes regarding the creation of testdata