Fix some failing tests (caused by change in default DSLD setting)