fix failing tests
Merge branch '1.x'