ENH: better tests