Fixed model and test