Fix some failing tests.

This fixes some tests I saw had failed from my last PR since you merged before it went green on travis.