Fix up dir related tests