fix tests and narc