Merge "Added unit tests for GuardPolicyDelegate"