CORE-1509 Memory improvements for large sqlFile files: Fixes for failing tests after changes