Refactor select test to new model.