Merge "JUnit tests for VnfResource"