Cloud Policy Service - When will we be able to make changes to policy assignment scope.

Is there a recommended practise to test and deploy a policy to All Users? e.g. target a small pilot group then release to production. With the current limitations of not being able to change the assignment scope or changing the AAD group currently assigned, its challenging.

In order to test and release policies, we need to target a policy to AAD groups, then release to all users. This is a painful process for policies with a large amount of settings, because you can't change the scope assignment once its been created (either changing the group or changing away from assigned to an AAD Group. If you 'copy a policy', it retains the 'this policy applies to users in the specified group' and you can't change it to 'applies to users that access documents using office on the web'. I've been lead to believe that 'applies to users that access documents using office on the web' is essentially 'ALL USERS'.