Attempt to fix up tests on SQLserver.