improve policy testing