ENH: Better coverage and IO support