merge issue709
fix failing unit tests
Merge branch 'fixTest' into 2.0.x