Small changes in model plus extra unit test.