Code reorganising, NLO convolve and htest are closer