Fix tests
1.6.0