more changes to have tests use unique IDs