Fix PolicyInstanceComponent and add test coverage