Fix unit tests
Changelog update