Merge "Add test coverage of PolicyInstanceCompnent"