Fix up UTs (NB - RegStoreTest.ExpiryTests is disabled as it wasn't handling NOTIFYs and now hangs)