Model model/tests - further adjustments

+ merged Holger's and my solution a little
Merge branch 'mapapps' of https://github.com/ps-md2/md2-framework into mapapps