Fix a bunch of false positive tests and finally get replace right