ENH: More tests