Corrections due to SCB limit in downloads
Added test case for big data queries