Further refactor resolve and add test coverage
Merge pull request #72 from Dparker1990/remove_rescue_duplication

Further refactor resolve and add test coverage