Added correct output dirs to test descriptors.
Added logic for new geenration of xar.