Fix self-test expecting a removed message