Fixes for V&R tools and tests

Fixes for V&R tools and tests