improve policy tests