Improve coverage

I don't think we are going to be able to improve coverage much more in a meaningful way until we can run some of the quadratic stuff on Travis.