Update Entity Framework models and methods with new database schema

[paulmccarron]

Update existing database models and database service to use the revised database schema.

Update unit tests.