Removed NPCTest extra code