Fixed few more cv tests