Small improvements in the simpleModel test