Merge branch 'logLevel' into 1.6.x
fix failing unit test
Merge branch 'fixTests' into 2.0.x