Fixes #1 fixes #2 tests for generic model extended