tweaks to get tests running in latest 4.4 dev
Merge pull request #4 from parrt/master

tweaks to get tests running in latest 4.4 dev