Fixed cv tests

Hopefully this PR should fix all failed CV tests.