(PUP-208) Merge acceptance tests from CVE-2013-3567 upstream