Range support, start fixing tests.