fixes in testsuite and np-bar rule