Merge branch 'fixTest' into 1.6.x
make test logs less verbose
Merge branch 'verboseLog' into 2.0.x