Modify gvnfm-vnflcm code and unit tests