Added adapter to product catalog to implement indirection and protected
variation
Fixed broken test