Tests for more database models (#15, #16)