Fixing depedencies
Forcing empty dir to exist everywhere for tests