Updated model and Test