changed order of tests