Test modifications to work with generated instance ids