Add Resolver tests.
Fixes and corrections to existing classes.