Merge "remove vnfm adapter tests"