fix the changelog merge
- these tests are really old but trying to make sure everything is closed out