tests for ModelConverter_ModelWrapper and bugfixes for a bunch of other tests