Added tmp, testdata and output dirs