Fix some inconsistencies from merging
Some of these differences between 2.6 and 2.7 were missed when merging
the CVE-2011-3872 branch into 2.7. This commit fixes up those issues.
Primarily it is test fixes, but also a method was renamed and missed.