Simplify implementation of configure method, and rectify incorrect te… #7128

Job	Run time
Parse.ly: 3.1 filter_enabled	3m 1s
Parse.ly: 3.1 filter_disabled	2m 59s
Parse.ly: 3.1 option_enabled	2m 59s
Parse.ly: 3.1 option_disabled	2m 59s
Parse.ly: 3.1 filter_and_option_enabled	3m 0s
Parse.ly: 3.1 filter_and_option_disabled	2m 59s
Parse.ly: filter_enabled	2m 57s
Parse.ly: filter_disabled	2m 56s
Parse.ly: option_enabled	2m 58s
Parse.ly: option_disabled	2m 56s
Parse.ly: filter_and_option_enabled	2m 58s
Parse.ly: filter_and_option_disabled	2m 58s
	35m 40s

Provide feedback