moved order of tests