move test from classes to defines where it belongs
Merge branch 'add_more_config_args'