NItpick: Could you place that unittest along with the others, under the second definition of remove? Other than that, lgtm.