Refactor retain test to new model.