More convergence, all tests passing for modules aligned so far.