NpcTest now more independent of default values