Added and refactored range tests