Merge branch 'i675' into 1.6.x
rename test class & fix failing test
Merge branch 'fixTests' into 2.0.x