Better tests. Revealed strange error in .remove(k)

...look like my home-made hack sucks after all