Nearly all tests pass now