Revert "Break out XUnit, MSTest & MSpec argument building"

This reverts commit db7641ba59d94fc2ee8ed08d9772906b310aa3f8.