Added conditional testing and related driver args