update tests for deterministic naming in 08ed19078