Fix random Baron failures
Possible Navigator test fix
Ensure deck is ordered before putting discards under it