fix failing test
Merge branch 'fixTest' into 1.7.x