refactor sqlcmd test and over-instrument sqlcmd