Refactor range test to new model.