clean-up Database#<< spec a bit