NXP-11142: update tests according to id changes