Merge "Delete several DH key tests"