Fixed some broken test for RV.