Make existing ModelTest users use the new ENABLE_MODELTEST define