Fix VFConnector tests
Merge pull request #300 from bhariharan/unstable20

Fix VFConnector tests