Introduced hierarchy of interfaces for Npc and DefaultNpc
Removed outdated tests