Fixes for V&R tools and tests

Fixes for V&R tools and tests
Added needed tests to V&R build.xml

Added needed tests to V&R build.xml
Merge pull request #66 from mfunk/master

More fixes for V&R