Fixup all test model Fixes #2