One solution on the safety valve front could be to remake the manifold on the top of the boiler thus adding a spare hole for a safety to be fitted. No need to lecture on the boiler test front then, wouldn't help anyway as I think your test code is slightly different to ours
