all but two of the old tests reworked and passing.