Merge pull request #92 from amtep/master

Fix unit tests
[resolver] Record elapsed time in ContactResolver

This helps with optimization work