More tests refactored
ComparisonStrategyProvider introduced.