Fix test when math more is not there
Copy vdt and vc form master in 5.34 branch
Fix error in cake file