Made adjustments to database models to better accomidate unit tests