model: withData and withShellData tests

+ bugfix in withShellData