Cope with tests that hang.
tweak
clean up remaining version-related failures