I'm starting to suspect this introduces a backwards-incompatible change (based on the test changes below), but I'm not sure what to suggest. Maybe we need a helper method for generating the ID?