tests for many more policies and a bugfix

Change-Id: I835218e6e9b69b62f4dea267b99c43681a9b75e2
checkpoint

Change-Id: I6890965179d3ffa6b13f74588a3a73867d361650