Add readResolve() support
Some more testing
More tests and fixes