Minor reconfiguration to avoid descending into test directories..