1. Create a course with groups and groupings, and a course without groups/groupings 2. Regression test backup of the course with, and the course without groups/groupings confirm include groups/groupings is the default selected option (current behaviour) confirm that groups/groupings are included when "Include groups and groupings" is selected (by either manually inspecting the mbz package generated or attempting a restore/import) confirm that groups/groupings are not included when "Include groups and groupings" is selected confirm the the options for groups/groupings does not interfere with settings for backing up enrolled users 3. Regression test restore of the course with, and the course without groups/groupings confirm include groups/groupings is the default selected option confirm that groups/groupings are not restored when the option is not selected confirm that groups/groupings are restored when the option to include groups/groupings is selected confirm the the options for groups/groupings does not interfere with settings for backing up enrolled users 4. Regression test import of the course with, and the course without groups/groupings confirm include groups/groupings is the default selected option confirm that groups/groupings are not imported when the option is not selected (confirm this does not affect existing groups) confirm that groups/groupings are imported when the option to include groups/groupings is selected (confirm this does not affect existing groups) confirm the the options for groups/groupings does not interfere with settings for backing up enrolled users 5. Confirm the above two scenarios work with a combination of the other restore/import options selected (confirm this option should not dependent on if user data is included) 6. Confirm the option to select groups/groupings is not available if the backup does not contain groups and groupings 7. Confirm previous backups are still compatible 8. Confirm that the default setting configuration works for including groups and groupings 9. Confirm that scheduled backups include groups and groupings if configured and that they do not when configured not to include Also for a bit of visual verification you can open up the generated .mbz file and inspect the inforef.xml files in their appropriate folders to see they are containing the correct well formed xml to not include groups. The same goes for the groups.xml file. You should also be able to see the XML structure has not been affected by this patch. I've also attached some postgres dumps if anyone needs to come back and test this