WIP ENH/FIX: Better coverage

Opening now to see what Coveralls says. Not ready for review, needs to be finalized and have #80 merged first.