Model + Test updated