Improve coverage of a few tests a little bit.