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