Remove sorting variables from tests