some improvements: new method "resolve"; new tests; updating existing tests