Merge "Added junit for policy-management"