Fixed models, ready for validation, passed all tests
Merge remote-tracking branch 'origin/HenrikValidation' into Lars1.5