Remove the max size of collections. Sync up the cross test logic