makeRange fixes + tests refactoring (checks reordered)