Fix vpe tests errors