Update testing setup and config.
Fixes to policy.json

Closes-Bug: #1789961
Change-Id: Iac5da7cd02a5c87f3002dbabf6c21a5c2f936536