ENH/FIX: Better coverage

Ready for review.