Cahnged structure of tests