Generalize policy test a bit more