Fix tests
Switch to sorted set