Fix up all test model Fixes #2