small improvements in tests
bug fix
Merge branch 'develop' into testing-ninja
some improvements