Modified database structure.  Wrote test cases for all models.