@Tillsten The test fails with your proposed changes.