Revert "Fix up tests" due to accidental push to master.

This reverts commit 547097f963a17dde8af2a9ec7557923778f4f3c5.
Revert "Have different binds for different databases" due to accidental push to master.

This reverts commit ddb27db06fc95b89f1bf6b0096404e97e816cda3.