Merge "Add tests of PolicyInstanceDialog"