Add new model classes... and, tests.