Merge "add test coverage of PolicyInstanceComponent"