ENH: Add test, cleanup