Updated database definitions, roughed in unit testing