ENH: better and more tests + address discussion