ENH: Better testing