Corrected unit test cases failures due to range calc code changes