Made the tests pass for deferred removal