Tweak customsql tests