Update definition of an empty model.
Update tests for incorrect containable behaviour if a model only finds 1 field.
Merge pull request #2204 from thatcode/master

Models fetched by Containable find depend on number of fields in intermediate Model