SOC-4219: Revert testing on limit and offset