Fixes broken QueryExecutor tests