Update model classes and add a model testcase