Changing the policy interface and test case