Refactor some code, minor fixes.
Add eliminate  tests to the resolve cache.
Add clear tests to the resolve cache.

Improved existent tests.