Make adjustments to pass VRF simulation test

These are various bug fixes and parameter adjustments to get vrf.rb
test file to run properly.