add policy finder and redo tests