You are right and actually there are several ancient unit tests that are in need of some attention and should be refactored. However, I would do that in a different pull request. I will open a bug for that.