Fixes for DS policies tests

See #4