ENH: A bit more testing, a few words of caution