Merge pull request #2078 from AdvaitPote/bigsize_tests