Fix broken tests (NMS-6059 follow-up)