Fix stubbing in test that sneaked in through a back port not considering the change which method was used for entity removal. Original pull request: #641.
Fix stubbing in test that sneaked in through a back port not considering the change which method was used for entity removal. Original pull request: #641.