Another patch for optionally configuring tests