More fixes, 83 tests to go