Switched some tests to model.