ENH: more tests