Fix 1N overcalls to be 15-18 and update tests which were incorrectly depending on the wrong range