fixed tests and generalised policy