NXP-14672: fix soft-delete tests and repo lookup