Merge "Disable testOffset until it can be revised"