13th push - with working test npc