tests (and fix up) for remove functions