changed position of tests