Add missing specs and update the rest of them accord to the new changes in the models.