ENH + FIX: tests, cosmits, discussion