Fix some problems up with LDO and Proxys plus UoW while fleshing out testing