Mimic the production behavior on tests and add CHANGELOG entry