Merge "Make create_server tests more policy-granular"