Merge pull request #4287 from drizzle-team/optimize-int-tests