Update test suite for sql changes