Directory fixes on test