Tests fixed, ModelTrigger ok