Adapt tests to new dir() default settings