add policy and tests