WIP ENH: Better coverage of necessary functions