fix tests.  All passing.