Trying to cover more of the common cases that could be left out of random cases.