Add tests for resolve method