fix failing unit tests
Merge branch 'fixTest' into 1.6.x