Refactor policies tests

Change-Id: I04390a0b305e970aa609db27fa0c091657132fa0
Merge "Refactor policies tests"