Fixed up TestNPC and TestPC. (They required a new TestRace...)