Make separation for directory vs. file tests