Looks like we should move DictModel out of the test package.