Merge "Unit tests for dynamic policy file discovery"