tweaks to Thread and Finally CTORs - and test code