npc check-expect stuff completely done