This MR should fix all staggered models. After being merged into feature/iofields, a rebase might be useful.
We still need to decide whether to keep the unit test in the current form or simplify it.