COM-834 - Add new tests to check offsets