Small improvements + unit tests
Improvements

- delta rule now is able to filter out single selection
- MarketRuleManager has been improved with the introduction of conflict
solving capability at the selection level
Fixed previous commit

- Added new unit tests