another reorganization of the testdata