Fix some dependencies
Namespace on global functions
Add VFData.cc; namespace fix is all it needed
Uninclude tests for now