tests fixed
Merge branch '1.7'