Adding more tests and stubs for models.