Change tests so they no longer depend on the order of sorting numbers with strings.