Test suite working well. We now need full test passage.