bug 808370: almost all tests pass now