testd updates
tested up to 4.0, no code changes