Fixing test: There are more folders due to transactions
Update CHANGELOG.md
Update CHANGELOG.md
Merge branch 'develop' into feature/gui
merge develop