Fix golden master updates and cleanup handling in tests#780

jacebrowning merged 5 commits into

doorstop-dev:developdoorstop-dev/doorstop:developfrom

opt12:779-golden_master_fixopt12/doorstop:779-golden_master_fixCopy head branch name to clipboard