ENH: Cleaner utils and testing
Merge pull request #354 from Eric89GXL/restore-changes

ENH: Cleaner utils and testing