update tests for upstream v4.23