Update models. Add missing unit test cases.