Fixing #1986 and a few other minor issues 

This PR adresses #1986 and #1997. Furthermore I came across a bug in `Model2DKernel`, which is also fixed.
Furthermore I added tests for the `ModelKernel` classes.