Fixed tests for the Model package