updated some models with correct fk and test update