Pull out setting dh keys (so devel launcher doesn't do it)
Fix testcases.