expanding model and schema and adding tests.