Fix failing tests introduced by ba6e7ea
Merge pull request #1465 from Gozala/bug/modelFor@695143

Bug 695143 - Fix failing tests introduced by ba6e7ea r=@Mossop