Formatting of new policy code
Some more tests about merge policies (such as they are)