Added sorting to more tests to stabilize expected results