Add support for directories (simpler test scripts)