Fixes to Range tests