fixing the ncf
clean test suite!