Fix up the sql integration tests.