Cookie struct instead of tuple
Added incomplete tests for ConversionFactory
Conversionfactory tests