fix test failures related to missing Ids