Added test cases for default handler and helper classes.
Added unit test for resolution processor and for resolution merging. Minor refactoring and bug fixing of tested classes.