Change accessor name to upper_limit
Correct the behavior of the loop
Fix the expectations on previous tests
Code cleanup