change structure of tests