ENH: Better coverage