Revert change to GTH and update tests