Fix remaining test errors

This should get things passing on TravisCI... Don't merge until that's true.