Fix tests

The tests in this repo are failing quite poorly. This PR fixes them to be green once more.

/cc @github/markup @vmg