Fix tests to use new directory setter