Couple more test cases added
Broke RV look into seperate call to help Camino tests.
Changed unit tests to work better.