Fix tests and default policy