Update structure of tests