Start implementing some model tests and fix some model instantiation errors.