Added IdResolver tests.
Refactored names.