Updated sql tests to be more resilant to having the working directory cleared between runs