Refactor interval test to new model.