Now that registry uses readonly by default, need to tweak any tests which need to create keys / set values etc.
Tidy up and note one remaining failing test