Merge "Add unit test for resolution repository"