Added sorting in TestStep