ENH: Better coverage of various sections