tweaks to get tests running in latest 4.4 dev