Fix broken specs
Fix broken specs

Conflicts:
	spec/models/subscriber_spec.rb

wuboy0307/solidus_chimpy,WalkerAndCoBrandsInc/spree_chimpy,wuboy0307/spree_chimpy,andreteves/spree_chimpy,wuboy0307/solidus_chimpy,DekaFugihara/spree_chimpy,DynamoMTL/spree_chimpy,andreteves/spree_chimpy,DynamoMTL/spree_chimpy,DekaFugihara/spree_chimpy,wuboy0307/solidus_chimpy,firmanm/spree_chimpy,JuandGirald/spree_chimpy,JuandGirald/spree_chimpy,wuboy0307/spree_chimpy,wuboy0307/spree_chimpy,asketsthlm/spree_chimpy,asketsthlm/spree_chimpy,WalkerAndCoBrandsInc/spree_chimpy,DynamoMTL/spree_chimpy,JuandGirald/spree_chimpy,firmanm/spree_chimpy,andreteves/spree_chimpy,WalkerAndCoBrandsInc/spree_chimpy,firmanm/spree_chimpy,DekaFugihara/spree_chimpy,asketsthlm/spree_chimpy