Add a test for the case when the replacement contains the search string.

In this case the current code works, but alternatives I was considering
might not.

Also removed the small test - that case is already covered.