unit tests

combined npc tests with other unit tests into class test suite