extended tests moved them to correct positions