Rework temp directories for testing