Added switch for optional test config