Fixing a few (not all) tests
Fix failing tests
Update changelog
Merge branch 'develop' into feature/daemon