rename test method
Merge branch 'issue696' into 1.6.x
fix failing test
Merge branch 'fixTest' into 1.6.x