Merge "Add test Coverage for Policy Service"