Merge "[Testing] To migration DefaultSubscriptionControllerTest"