And other small tweaks to bring test coverage up. Turns out there were several test methods being needlessly skipped.