Include Pedro's commit ded8766b and run our new test suite

@chriddyp