Update the policy adaptor and related testcases