Merge "Add test to ensure consolidated policy is updated"