fix tests for changes in reorganize main branch
...