Fix test.
Merge branch 'develop-merge' into develop
Rename #1
Rename #2
Merge branch 'develop' of https://github.com/nxkit/nxkit into develop
Merge branch 'develop' into develop-merge