Revert "Fix creation of test data"

This reverts commit 99f788c2426d184b8771e4b55846caa38a80b506.