Merge "test_vnf_generic: fix unitests when files are present"